Added version switch