Updated to find more gagets.