proper upgrade-charm - more