changes smathot
merge changes Sebastiaan with new clock