Added toggle to exit classes