added timer
fixed merge conflicts
added counter
merged counter