Final script updates