updates per Haiming suggestions