Revert "rearranged"

This reverts commit 32f812a21233807628619131470218d6ba1ee1cf.
new IMG attempt