added inputs from Andrea