Updated server side a bit