Incorporate Ian's comments