Updated version for beta 1