WYRL: beginning the process of fixing up the equality issue using an external function.
WYRL: minor fix.