Fixed an issue and moved the toggles to CGSystem.