Minor Optimization to wrd-far
Add more relationships and refactor relationship testing