Changed to number inputs