Incorporated Edward's comments