Modified DS2 *again* to use the right value order