Update for Beta 6
Beta 6