ELENA VM overhaul