Address Sean's comments