changed some things around