Completed the other changes.