Fixed timer problem - still have 1 more to fix