working on eoMaintain
merge conflicts