add name to inputs and ...