Updated for beta of 2.0