Updates from developing w/ pedestal