Preparing for live version