Latest script changes