updated per request from cwimmer