Made rephase much faster... and much more obvious