Now on/off feature works, but not perfectly