attempt to add mapping code