More changes based on feedback