- modifications to parser