Merge AW changes?

Adding a line.. Can u review & merge?