minor changes to load