fix to move into output framework