Updated to Beta 1-2