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 this pull request auto-merged, please update it to only add lines.