More work on the reverse lookup