Final changes for initial launch