- some refactoring to use replaceAllMapped