added mapping tool