Panette S-Support edit (@BetterCommSoul)