latest from upstream Adam