Sound attachment to source

Pull request not for master as not branched from master ... Sorry for that, I thought it would take a little longer.