updated for beta 2