added clock
merge with master