Changes for the new Pie