Performance improvements
merge