Changes, sans def fix added.