Solutions for ISSUE-8