added experimental Ender support