cleaning up timer lines
merging down changes
fixing timer path