Changes to new clocks
Merge pull request #228 from Prillan/clocks-changes

Changes to new clocks