changed map load logic