Working version, all charts updated