Sauce: better parsing