Stage 2: Needle in a haystack
fixes