update scheme and checking for  #10