Added PC and WAP judgements