Incorporated jeremy's comments