Changeover to Aqueous class.