added clock timer
merged conflicts