added better toggles