Updated classes

Tips from Peter