SlimPie (Remaining Changes)