Scripts updates
Scripts updates II