added task 2.1 and task 2.2