seperate map etc. and reword appropriately