ISSUE-9 solutions