Adding in Toggle Logic