incorporate rtg-dir review comments