Feature/jira 2

Please comment on updated code