Newer script upstream