Added subjects. Rearranged cols.