Updated toNumber