Better performance
Some more love and performance and compatibility