updated based on @corinnekrych feedback