v7

added switch