merged lee's timer