More changes for some testing and feedback