Updated TheChocolateFactory