Updated subsetter to use PAA