fixup step 2
fixup moves crucial part