Changed the way parsing is done.