incorporate Glenn's comments