fixup! fixup! added mapping table