Small changes to load in the right order