Rework outputs