cleaned up eda/primary code for sharing