Changes to task 2. Modefied structure