Updated for beta7.