added timer
merging timer