Timer added and tested