task2 working
task2 working & merged with task3