Load logic improved (Bugs remaining)