Update to Auto Complete Function

Update to Auto Complete Function