Script overhaul