EOPD/Optical changes