update according to David Todd's recommendation