Parsing correctly

Had to update a few things