updated with notes about mapping mistery