changes for live server support