About to merge structural changes properly