added 2 classes