Redo using the new parser