Newer version much slower to load