Update to Beta 2.5