fixed & improved the loading semantics