almost done with map & calc