lookup disabled for now.
cleaned up the changes a bit