Incorporated recommended changes