Merging with final changes.