modified timer
merge conflict fixed