Slight changes to World.java