removed old check_and_reset