Updated to use 2 upstream repos