Updates for NeedleInAHaystack