lookup handling code modified
lookup handling code modified