added auto completion