UPGRADE. Added parser for new source