comment out timer:
Merge branch 'joseph' into develop