remake chapter_2 and chapter_3 map