Addtional changes reflecting updates to EAtools