Scorpion optimizations