added code for handling AU in client