Bring non-rigid up to speed