Extension script mods..
revert to a version which works with bigger datasets