Updated based on Steve's comments