updates to match panopoly requirements