PK Issue Partly resolved. More testing needed