Added ability to split data by course