more work for code review of 868227