Removed ugly converter :D