these changes look good, but are they necessary for this commit?