Continued to work through the Beta 6 changes