Slight modifications for Task1 and completed task2 except progress bar