Scripts updates II