faster server. Sorting fixed