incorporate feedback from Mike Youngstrom