Implemented task 2.1