added several other inputs to be explicit