map-final modifications