changed some things to match