final updates for Beta2