Update to new timer functionality