Refactor again, just