adding some of Dan's comments in