Removed map.update, which is unnecessary