Added conversion table. Bugfixing