Name: component toNumber and fromNumber updated