Generated changes from my latest tweaks, and those from Huming Teo