Gyration: ported the optimizations to v2.0