Add remove and sort