Issue #11: refactoring + added to TendencyActivity