did some work on the server side