Dan's suggestions
final tweaks