Updated tasks 1 and 3