More changes to feature