timer first version
merge