changed formulas slightly to return more relevant results