Merged to two versions for all mods