Number Arithmetics added for correct conversion