task2 + logic fix