changed the server side - version2