minor changes in Timer