reviewing code, responsing to fabio's comments