Added WAP