My initial changes.