minor reorganization of load order