Addressed AD review comments