Update for beta 7