Finish script changes