Rewriting like half the addon