timer code
merge