More set checking and arranging!