accord wrench to Tim's changes in composer