slight changes to shutdown procedure for Timer