Task 3.04 finished for OO