merge with the paranoid support within addons