Better toggles

Better toggles change