updated client behaviour