-refactored reverse table