Steve's suggestions addressed