More review comments addressed.