Final mods based on feedback from Bao.