More Contracts Goodness