added switch lookup for andrew