v1.1 merge. This vastly improves performance.