Changing server to a better interface
small fix in server