modified as addons instead of scripts