Final changes for beta launch