changed some things, but don't remember what