minor adjustment (switching on switches by default)