small server rearrangement