Andy added code for new maps