Fixing non-working lab3 because of refactoring