Fix Hill switch logic and timer sync