Made changes after review ENG-31