updated to do math