- conversion tables redone