Changes to how stuff is loaded inside