Map logic 90WP

207