Updates by AquaSwitch