changes after problems with server