more tedious changes