Updated to avoid exec.