added auto complete features