Little improvement on server