[TASK] Output improvements