Merging older visual improvements