Adjust Afternoon 4 to take into account refactoring