updating for panopoly 1.2