Add all from upstream