some changes with server