Hacking on some script updates