added timer
merge