Had to revert it back because of crashing