few changes in timer, not functional