More changes based on feedback from Alan