multiple changes all over the place