matches and changes to feature generation code