parser updated to reflect new conventions
merged