improving locations mapping