Swap live witn on and fix notices