revise server side