New Aud-SWIPE-P version, modularized.