Last commit before attempting to play with a pop up map. This is a 'just in case' fallback