Updates for beta5