changed the wavelets to match new APIs