Some beta2 changes!