ABC Order and a couple of changes