nickell-andrew add remap arg to output_generic