Fixed dependencies for new upstream and changed to new upstream
Fixed dependencies for new upstream and changed to new upstream