Updating with whitespace correct parser