Moved history logic into featureList