Script refinements