Final script changes