i may have changed some things