Upgrade also working. All tests pass