ISSUE-20 solutions