Forgot they turn off in water

Also this and the last commit are part of #37