Changed server logic