Version working with server display