Rework in progress
merge test