Update for beta6