server improved, not ready yet