ISSUE-6 solutions