tweaked loaders, now passing all unit tests!