Updated post processing