more changes i forgot to add in