Refactored live chart