Moved on_off up a package level