Rework after merge