P: added task 4.1 and 4.2