added some work with server