Updated for beta 7.