Large script improvements