Added OP, PAAPD to sort