ISSUE-3 solutions