update to better autofind keys