updated for chart 2.2.0 upgrade