Changes per comments from Hongkai.