Less parameters
Small changes in task2