A little tweaking.. hopefully the timer is good now