review comments; to be squashed before merge