Moved switches to correct places