Revised based on Chris's comments