A lot of changes for Task 4