changed sort order, deleted test code