re-introduce switches, which were removed by accident