more upstream updates