clock counter
clock counter
merge commit