Alligned version after the merge