integrated some of Adam's suggestions