More efficient detection