Switches finally fixed.