Merged final updates