To merge with Indicators.scala
Merge complete