changes to product to make Mandrill work