Updated for beta3.