new version

added switch