We're moving it earlier, so for not-yet OO version
We're moving it earlier, so for not-yet OO version