More changes for feature C