Collection of improvements
merging