More script changes