almost done with map some CR