New changes

Task 3.3 completion