Updated for HW4, part 2 (my own product)