Updated with Sean's comments