working changes to beta version