Re-arrange; remove Numbers() now that using input number