O3 fix
Moved things around