made this app compatible with haystack stable version