parser corrected to work with new structure