Updated Indicator calculation