Improve command calling within command
Improve arithmetic