[diff] major performance improvements

[diff] major performance improvements #1481