Fix a bug, add order analytic crunching