Thanks for bringing in these changes too