Rework Pie Tile mechanism (2/2)