to merge
merged
better routing, always works on direct link