Stable now with 1.7 and optimizations