Refactor and OOT