mearging in changes from eda project
throwaway
fixing filter conflict between eda and main