refactored charts