Further work on remapper