incorporated @rwcarlsen's comments