server side improvements