Modified server code

Change-Id: If87066aba22c0e04aea34ebbda035f01d89a4971