Jira #27 refactored
Jira #27 refactored