Rework outputs. For #67