ISSUE-16 solutions