Removed ugly Nested Loop
Do direct lookup now