CXX-182 updates requested after second review