Added Both sort to sort class