simplify
more consistent method names
add catch all for other tie conditions