Final changes pre-launch