changes based on patch reviews