Implement AWA with shift handling.

[SwapnilR]

I cannot find any proper reference for implementing AWA with shift handling, please attach reference material if you know any . Thanks!