scary parsing changes