changed generic input to named values