incorporated major parse changes