Revert "faster and faster!"

This reverts commit f7c7bf9c42cd78646d99611e8a8c4cfea563cc40.
Revert "Revert "faster and faster!""

This reverts commit b930cb7d63002aab548f8a5da69de31372e2e5c8.
commande index qty bug