removed Signals, added to Indicator class