Added rest of toggle option