Added boolean check for ON