Edited version to beta