Some suggestions

api changes from beta1->beta2