Added smart toggle of case.