fixed input structure to be numeric for all
updated input