changed some things to match the view