Improve Run Script