Map logic 90WP

247