Dave's suggestions Take 2