Better device catching