Updating map and mask to a more user-friendly version