changed some things.