map a better version