update for beta 6