Further tweaks to the wiggle hack