added wAuth definitions
switch to use wauth definitions
Auto pep