Task 1.21 finished for OO