Changed for live server