some changes to list of classes