changed map and stuff