Prep for live server