Script changes - functionality, robustness