Had to fix some things