Moving indicators to separate classes