Copyright Header corrected, no more true-on-no-error