Updated with timer and pause