Updated for Beta 3.