Added the changes to auto-complete