Reverted back some input types