Sync update

Bringing Eric’s Version of the game uptodate with Yannis commit