update based on Jeff's feedback