design and parsing changes