Map better working