Remove av and add aw

Unfortunately, pull requests containing commits that delete or modify lines are not eligible for automatic merging.  If you wish to have a pull request auto-merged, please close this pull request and open a new one that only adds lines.