Added move counter
Fixed move counter implementation