Add Trung's changes to new classifier