Added suggestions from Agilent