Output rework in progress