map 6, 7 modified