try to improve toggle