added the changes from PM3 master.
added some code for the AWID26