Overhaul of all scripts