Continuing to work through the changes from Beta 5