Integrated Sarina's comments