merging HAYSTACK_SETUP changes;