ECO mapping update
Simplify and fix SEE function