updates to server logic