Further improvements from Junjie.