The auto complete work goes even more forward