Seperate ticking from time keeping
Better method names