Update from eps6
Update from eps7