map and more logic updates