NoTask - refactored and added another product