Fixing Toggle 2