Update iterator, core, detail from master.