Version switch fully implemented now