ADDED auto-complete