WPC ISSUE-11 solutions