Addresses JIRA Issues 23,25,41