added timer
merge logan