#444 updates after review