Improve random scripts