more updating with upstream