Changes by KE and JP merged.