fixed server with new structure