changed some things....