Updates to haystack