Some changes in scripts