Had to rearrange some things