update based on corinnekrych feedback