Re-implement Pie on/off switch (2/2)