Rewrite of server