Load logic improved (Bugs fixed)