implemented task 15.1 and 15.2