Changes for Beta 18