#1 script improvements