Change 'inputs' to 'sets'.

ALso, restore commented-out samples.