Changed a few Contracts