Added some of Dan's suggestions