map 18, 19 updated