More changes to feature 6