Timer design changes