modify for new project and breakout of Lookup