Added changes to Indicator.scala