small changes on server side