Output reworked