Merge. Now vlid code. (I suppose ...)