added tasks 1 and 2 from Artur