Preparing whole new output for #25 and #19