More work done to update  script