Updated for beta 6
