adding lookup functionality
merge