Final work on olympiad mode