added Nina's change