update with suggestions from Andy Lindeman