Beta 3 improvements