Rest of the changes.