changed some things