Map logic 90WP

640