Changed the deprecated load function, among other things.