Added ability to disable clock