Rearranged per rubric