add bundle & reverb wrapper code