final changes for beta