Serverside debugged and changed