server side changes that were missing