Oops too much cut-n-paste