Task 2 tested and repaired