more updates

added switch