Adding all the changes from the contest.