Some indicators calculations have been added