More ender refactor