Added bottoms up and new charting