Reroute tight loop for V0.2, redo length matching with tighter constraints (not for any particular reason)