Some script changes in master