refactored chart model
fixed merge
merge commit