modified misc AddOns