updated the parsing stuff again