added more toggles