Added move counter and updated rules