small server side changes