NO JIRA - correcting outputs