Updates for Beta 6