Some changes to script