Updated for new Sortadigm-ish kinda thing

Change-Id: I2d8d958875659fce3f51db7218f269c9150561c3