be more friendly w/ relay signalling
one more relay friendly, and better sort