Master AWP

Improve AWP to maximum in Workbench