Modified part 4 classes