more changes for beta