Updates to World.java