Changed the timer reset behavior, and added one lock for each device