adding in modifications, first go at timer resets