Some script changes