Merged final changes