Finished all issues in issue_3 branch