refactor the map a bit
resolve merge conflict