Changes eia,notification class
merge conflicts