update with review comments