Updated for beta release