Added true support for toggling