after adding map some minor changes