slight changes to the loader