updates to Loader to help with any timing issues when the Promises are resolved