worked on auto completion