Updating Script from fork