Modified world and code with comments