refactored chart model
fixed merge