updates to parser