Revert "removed Odoe's code"

This reverts commit 137927ede49767d05ee4fec458375e7f69417962.