Updated for beta5.