More script hacks