Script improvement