end of implementation  #12 and fixing  #35