Added Jimmy and other optimizations