working server commit