Added 2nd Switch - Case and another ignore