Update for Beta 1