Second attempt at case-order support