Made several changes to the way data is loaded.