merged 2 classes