Last set of changes.