Upgrade from upstream (change later to do both)