minor changes to server side