Updates by SolaQuaGen