rolled back parsing changes