Switch to modern version