needleInHaystack added
automatic code tidying