update for beta 2