Beef up action find routine