now working with mapping editor