Scripts improvements

Pull request test.