moved timer out of states