Add 3rd class
Minor changes