WPC ISSUE-5 solutions