Incorporating review comments from ayust