Small improvement, now using FEATUREP.