more changes i didn't keep track of