Had to make some changes