better lookup functionality