More script updates