some small changes for beta2