Michael's soundmatcher changes.